Merge git://git.denx.de/u-boot-mpc85xx
authorTom Rini <[email protected]>
Tue, 20 Dec 2016 17:20:12 +0000 (12:20 -0500)
committerTom Rini <[email protected]>
Tue, 20 Dec 2016 17:20:12 +0000 (12:20 -0500)

Trivial merge